turnkey/openpgp-card
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openpgp-card: rename AlgorithmInformation::filter_by_keytype -> for_keytype

Browse source
This commit is contained in:
Heiko Schaefer 2023-08-29 17:16:52 +02:00
parent f7f7a1dd3c
commit da776bc4cf
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openpgp-card/src/card_do/algo_info.rs
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2021-2023 Heiko Schaefer <heiko@schaefer.name> // SPDX-FileCopyrightText: 2021-2023 Heiko Schaefer <heiko@schaefer.name>
// SPDX-License-Identifier: MIT OR Apache-2.0 // SPDX-License-Identifier: MIT OR Apache-2.0
//! 4.4.3.11 Algorithm Information //! Algorithm Information [Spec section 4.4.3.11]
use std::convert::TryFrom; use std::convert::TryFrom;
use std::fmt; use std::fmt;
@ -15,7 +15,7 @@ use crate::card_do::{algo_attrs, complete};
use crate::KeyType; use crate::KeyType;
impl AlgorithmInformation { impl AlgorithmInformation {
pub fn filter_by_keytype(&self, kt: KeyType) -> Vec<&AlgorithmAttributes> { pub fn for_keytype(&self, kt: KeyType) -> Vec<&AlgorithmAttributes> {
self.0 self.0
.iter() .iter()
.filter(|(k, _)| *k == kt) .filter(|(k, _)| *k == kt)

4
openpgp-card/src/keys.rs
View file

@ -292,7 +292,7 @@ fn card_algo_rsa(
// Find suitable algorithm parameters (from card's list of algorithms). // Find suitable algorithm parameters (from card's list of algorithms).
// Get Algos for this keytype // Get Algos for this keytype
let keytype_algos: Vec<_> = algo_info.filter_by_keytype(key_type); let keytype_algos: Vec<_> = algo_info.for_keytype(key_type);
// Get RSA algo attributes // Get RSA algo attributes
let rsa_algos: Vec<_> = keytype_algos let rsa_algos: Vec<_> = keytype_algos
.iter() .iter()
@ -334,7 +334,7 @@ fn check_card_algo_ecc(
// Find suitable algorithm parameters (from card's list of algorithms). // Find suitable algorithm parameters (from card's list of algorithms).
// Get Algos for this keytype // Get Algos for this keytype
let keytype_algos: Vec<_> = algo_info.filter_by_keytype(key_type); let keytype_algos: Vec<_> = algo_info.for_keytype(key_type);
// Get attributes // Get attributes
let ecc_algos: Vec<_> = keytype_algos let ecc_algos: Vec<_> = keytype_algos