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

Throw errors for unexpected values while processing ExtendedCapabilities from the card.

Browse source 
(Note: observed mse_command_support values were 0/1/255, so checks for that field have been disabled for now)
This commit is contained in:
Heiko Schaefer 2021-09-07 14:26:29 +02:00
parent 6a7cb7287a
commit 5a49b578f9
1 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
openpgp-card/src/card_do/extended_cap.rs
View file

@ -3,7 +3,7 @@
//! 4.4.3.7 Extended Capabilities //! 4.4.3.7 Extended Capabilities
use anyhow::Result; use anyhow::{anyhow, Result};
use nom::{combinator, number::complete as number, sequence}; use nom::{combinator, number::complete as number, sequence};
use std::collections::HashSet; use std::collections::HashSet;
use std::convert::TryFrom; use std::convert::TryFrom;
@ -72,16 +72,41 @@ impl TryFrom<&[u8]> for ExtendedCapabilities {
type Error = Error; type Error = Error;
fn try_from(input: &[u8]) -> Result<Self, Self::Error> { fn try_from(input: &[u8]) -> Result<Self, Self::Error> {
let ec = complete(parse(input))?; let (
features,
sm_algo,
max_len_challenge,
max_len_cardholder_cert,
max_len_special_do,
pin_block_2_format_support,
mse_command_support,
) = complete(parse(input))?;
if pin_block_2_format_support > 1 {
return Err(anyhow!(
"Illegal value '{}' for pin_block_2_format_support",
pin_block_2_format_support
)
.into());
}
// NOTE: yubikey 4 returns 255 for mse_command_support
// if mse_command_support > 1 {
// return Err(anyhow!(
// "Illegal value '{}' for mse_command_support",
// mse_command_support
// )
// .into());
// }
Ok(Self { Ok(Self {
features: ec.0, features,
sm_algo: ec.1, sm_algo,
max_len_challenge: ec.2, max_len_challenge,
max_len_cardholder_cert: ec.3, max_len_cardholder_cert,
max_len_special_do: ec.4, max_len_special_do,
pin_block_2_format_support: ec.5 == 1, // FIXME: error if != 0|1 pin_block_2_format_support: pin_block_2_format_support != 0,
mse_command_support: ec.6 == 1, // FIXME: error if != 0|1 mse_command_support: mse_command_support != 0,
}) })
} }
} }