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

Static allocation for list of supported algorithms

Browse Source
This commit is contained in:
Egor Duda
2022-05-16 18:12:15 +03:00
parent 9713332eff
commit 7f6ff31dd1
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ctap/mod.rs
View File

@@ -123,18 +123,15 @@ pub const EDDSA_CRED_PARAM: PublicKeyCredentialParameter = PublicKeyCredentialPa
alg: SignatureAlgorithm::EDDSA, alg: SignatureAlgorithm::EDDSA,
}; };
fn get_supported_cred_params() -> Vec<PublicKeyCredentialParameter> { const SUPPORTED_CRED_PARAMS: &[PublicKeyCredentialParameter] = &[
let mut ret_val = vec!(); ES256_CRED_PARAM,
ret_val.push(ES256_CRED_PARAM); #[cfg(feature = "ed25519")]
#[cfg(feature = "ed25519")] EDDSA_CRED_PARAM,
ret_val.push(EDDSA_CRED_PARAM); ];
ret_val
}
fn get_preferred_cred_param (params: &Vec<PublicKeyCredentialParameter>) -> Option<&PublicKeyCredentialParameter> { fn get_preferred_cred_param (params: &[PublicKeyCredentialParameter]) -> Option<&PublicKeyCredentialParameter> {
let supported_cred_params = get_supported_cred_params();
for param in params { for param in params {
if supported_cred_params.contains(param) { if SUPPORTED_CRED_PARAMS.contains(param) {
return Some(param); return Some(param);
} }
} }
@@ -1169,7 +1166,7 @@ impl CtapState {
.map(|c| c as u64), .map(|c| c as u64),
max_credential_id_length: Some(MAX_CREDENTIAL_ID_SIZE as u64), max_credential_id_length: Some(MAX_CREDENTIAL_ID_SIZE as u64),
transports: Some(vec![AuthenticatorTransport::Usb]), transports: Some(vec![AuthenticatorTransport::Usb]),
algorithms: Some(get_supported_cred_params()), algorithms: Some(SUPPORTED_CRED_PARAMS.to_vec()),
max_serialized_large_blob_array: Some( max_serialized_large_blob_array: Some(
env.customization().max_large_blob_array_size() as u64, env.customization().max_large_blob_array_size() as u64,
), ),
@@ -1484,7 +1481,7 @@ mod test {
0x07 => env.customization().max_credential_count_in_list().map(|c| c as u64), 0x07 => env.customization().max_credential_count_in_list().map(|c| c as u64),
0x08 => MAX_CREDENTIAL_ID_SIZE as u64, 0x08 => MAX_CREDENTIAL_ID_SIZE as u64,
0x09 => cbor_array!["usb"], 0x09 => cbor_array!["usb"],
0x0A => cbor_array_vec!(get_supported_cred_params()), 0x0A => cbor_array_vec!(SUPPORTED_CRED_PARAMS.to_vec()),
0x0B => env.customization().max_large_blob_array_size() as u64, 0x0B => env.customization().max_large_blob_array_size() as u64,
0x0C => false, 0x0C => false,
0x0D => storage::min_pin_length(&mut env).unwrap() as u64, 0x0D => storage::min_pin_length(&mut env).unwrap() as u64,