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

Simplify get_data() by splitting it into a one-byte- and two-byte-tag variant.

Browse source
This commit is contained in:
Heiko Schaefer 2022-02-09 13:33:37 +01:00
parent 8a899afb9d
commit 476f46dacc
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openpgp-card/src/apdu/commands.rs
View file

@ -17,53 +17,49 @@ pub(crate) fn select_openpgp() -> Command {
) )
} }
/// 7.2.6 GET DATA /// 7.2.6 GET DATA (tag consists one byte)
/// ('tag' must consist of either one or two bytes) fn get_data1(tag0: u8) -> Command {
fn get_data(tag: &[u8]) -> Command { Command::new(0x00, 0xCA, 0, tag0, vec![])
assert!(!tag.is_empty() && tag.len() <= 2); }
let (p1, p2) = if tag.len() == 2 { /// 7.2.6 GET DATA (tag consists of two bytes)
(tag[0], tag[1]) fn get_data2(tag0: u8, tag1: u8) -> Command {
} else { Command::new(0x00, 0xCA, tag0, tag1, vec![])
(0, tag[0])
};
Command::new(0x00, 0xCA, p1, p2, vec![])
} }
/// GET DO "Application related data" /// GET DO "Application related data"
pub(crate) fn application_related_data() -> Command { pub(crate) fn application_related_data() -> Command {
get_data(&[0x6E]) get_data1(0x6E)
} }
/// GET DO "private use" /// GET DO "private use"
pub(crate) fn private_use_do(num: u8) -> Command { pub(crate) fn private_use_do(num: u8) -> Command {
get_data(&[0x01, num]) get_data2(0x01, num)
} }
/// GET DO "Uniform resource locator" /// GET DO "Uniform resource locator"
pub(crate) fn url() -> Command { pub(crate) fn url() -> Command {
get_data(&[0x5F, 0x50]) get_data2(0x5F, 0x50)
} }
/// GET DO "Cardholder related data" /// GET DO "Cardholder related data"
pub(crate) fn cardholder_related_data() -> Command { pub(crate) fn cardholder_related_data() -> Command {
get_data(&[0x65]) get_data1(0x65)
} }
/// GET DO "Security support template" /// GET DO "Security support template"
pub(crate) fn security_support_template() -> Command { pub(crate) fn security_support_template() -> Command {
get_data(&[0x7A]) get_data1(0x7A)
} }
/// GET DO "Cardholder certificate" /// GET DO "Cardholder certificate"
pub(crate) fn cardholder_certificate() -> Command { pub(crate) fn cardholder_certificate() -> Command {
get_data(&[0x7F, 0x21]) get_data2(0x7F, 0x21)
} }
/// GET DO "Algorithm Information" /// GET DO "Algorithm Information"
pub(crate) fn algo_info() -> Command { pub(crate) fn algo_info() -> Command {
get_data(&[0xFA]) get_data1(0xFA)
} }
/// GET Firmware Version (yubikey specific?) /// GET Firmware Version (yubikey specific?)