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

Fix clippy warnings

Browse source
This commit is contained in:
Heiko Schaefer 2021-08-26 18:23:34 +02:00
parent eaf46e6bbb
commit 38c701187d
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
openpgp-card/src/card_app.rs
View file

@ -111,9 +111,11 @@ impl CardApp {
Ok(ApplicationRelatedData(Tlv(Tag::from([0x6E]), entry))) Ok(ApplicationRelatedData(Tlv(Tag::from([0x6E]), entry)))
} }
/// Get data from "private use" DO, `num` must be between 1 and 4. /// Get data from "private use" DO.
///
/// `num` must be between 1 and 4.
pub fn get_private(&mut self, num: u8) -> Result<Vec<u8>> { pub fn get_private(&mut self, num: u8) -> Result<Vec<u8>> {
assert!(num >= 1 && num <= 4); assert!((1..=4).contains(&num));
let cmd = commands::get_private_do(num); let cmd = commands::get_private_do(num);
let resp = apdu::send_command(&mut self.card_client, cmd, true)?; let resp = apdu::send_command(&mut self.card_client, cmd, true)?;
@ -179,9 +181,9 @@ impl CardApp {
resp.check_ok()?; resp.check_ok()?;
let tlv = Tlv::try_from(resp.data()?)?; let tlv = Tlv::try_from(resp.data()?)?;
let res = tlv let res = tlv.find(&Tag::from([0x93])).ok_or_else(|| {
.find(&Tag::from([0x93])) anyhow!("Couldn't get SecuritySupportTemplate DO")
.ok_or(anyhow!("Couldn't get SecuritySupportTemplate DO"))?; })?;
if let TlvEntry::S(data) = res { if let TlvEntry::S(data) = res {
let mut data = data.to_vec(); let mut data = data.to_vec();
@ -422,12 +424,15 @@ impl CardApp {
// --- admin --- // --- admin ---
/// Set data of "private use" DO, `num` must be between 1 and 4. /// Set data of "private use" DO.
///
/// `num` must be between 1 and 4.
///
/// Access condition: /// Access condition:
/// - 1/3 need PW1 (82) /// - 1/3 need PW1 (82)
/// - 2/4 need PW3 /// - 2/4 need PW3
pub fn set_private(&mut self, num: u8, data: Vec<u8>) -> Result<Vec<u8>> { pub fn set_private(&mut self, num: u8, data: Vec<u8>) -> Result<Vec<u8>> {
assert!(num >= 1 && num <= 4); assert!((1..=4).contains(&num));
let cmd = commands::put_private_do(num, data); let cmd = commands::put_private_do(num, data);
let resp = apdu::send_command(&mut self.card_client, cmd, true)?; let resp = apdu::send_command(&mut self.card_client, cmd, true)?;