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

In select_data(): fold yk_workaround parameter into the openpgp-card business logic

Browse source
This commit is contained in:
Heiko Schaefer 2023-09-05 00:13:10 +02:00
parent 536bcf788b
commit e476103e6d
No known key found for this signature in database
GPG key ID: 4A849A1904CCBD7D
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
openpgp-card-sequoia/src/lib.rs
View file

@ -560,8 +560,8 @@ impl<'a> Card<Transaction<'a>> {
} }
/// SELECT DATA ("select a DO in the current template"). /// SELECT DATA ("select a DO in the current template").
pub fn select_data(&mut self, num: u8, tag: &[u8], yk_workaround: bool) -> Result<(), Error> { pub fn select_data(&mut self, num: u8, tag: &[u8]) -> Result<(), Error> {
self.state.opt.select_data(num, tag, yk_workaround) self.state.opt.select_data(num, tag)
} }
/// Get cardholder certificate. /// Get cardholder certificate.

35
openpgp-card/src/lib.rs
View file

@ -582,13 +582,7 @@ impl<'a> Transaction<'a> {
/// [`cardholder_certificate`](Transaction::cardholder_certificate) and /// [`cardholder_certificate`](Transaction::cardholder_certificate) and
/// [`set_cardholder_certificate`](Transaction::set_cardholder_certificate) /// [`set_cardholder_certificate`](Transaction::set_cardholder_certificate)
/// in OpenPGP card. /// in OpenPGP card.
///
/// `yk_workaround`: YubiKey 5 up to (and including) firmware version 5.4.3 need a workaround
/// for this command. Set to `true` to apply this workaround.
/// (When sending the SELECT DATA command as defined in the card spec, without enabling the
/// workaround, bad YubiKey firmware versions (<= 5.4.3) return
/// [`IncorrectParametersCommandDataField`](StatusBytes::IncorrectParametersCommandDataField))
///
/// (This library leaves it up to consumers to decide on a strategy for dealing with this /// (This library leaves it up to consumers to decide on a strategy for dealing with this
/// issue. Possible strategies include: /// issue. Possible strategies include:
/// - asking the card for its [`Transaction::firmware_version`] /// - asking the card for its [`Transaction::firmware_version`]
@ -597,7 +591,7 @@ impl<'a> Transaction<'a> {
/// returns [`StatusBytes::IncorrectParametersCommandDataField`] /// returns [`StatusBytes::IncorrectParametersCommandDataField`]
/// - for read operations: using [`Transaction::next_cardholder_certificate`] /// - for read operations: using [`Transaction::next_cardholder_certificate`]
/// instead of SELECT DATA) /// instead of SELECT DATA)
pub fn select_data(&mut self, num: u8, tag: &[u8], yk_workaround: bool) -> Result<(), Error> { pub fn select_data(&mut self, num: u8, tag: &[u8]) -> Result<(), Error> {
log::info!("OpenPgpTransaction: select_data"); log::info!("OpenPgpTransaction: select_data");
let tlv = Tlv::new( let tlv = Tlv::new(
@ -607,14 +601,27 @@ impl<'a> Transaction<'a> {
let mut data = tlv.serialize(); let mut data = tlv.serialize();
if yk_workaround { // YubiKey 5 up to (and including) firmware version 5.4.3 need a workaround
// Workaround for YubiKey 5. // for this command.
// This hack is needed <= 5.4.3 according to ykman sources //
// (see _select_certificate() in ykman/openpgp.py). // When sending the SELECT DATA command as defined in the card spec, without enabling the
// workaround, bad YubiKey firmware versions (<= 5.4.3) return
// `StatusBytes::IncorrectParametersCommandDataField`
//
// FIXME: caching for `firmware_version`?
if let Ok(version) = self.firmware_version() {
if version.len() == 3
&& version[0] == 5
&& (version[1] < 4 || (version[1] == 4 && version[2] <= 3))
{
// Workaround for YubiKey 5.
// This hack is needed <= 5.4.3 according to ykman sources
// (see _select_certificate() in ykman/openpgp.py).
assert!(data.len() <= 255); // catch blatant misuse: tags are 1-2 bytes long assert!(data.len() <= 255); // catch blatant misuse: tags are 1-2 bytes long
data.insert(0, data.len() as u8); data.insert(0, data.len() as u8);
}
} }
let cmd = commands::select_data(num, data); let cmd = commands::select_data(num, data);