From b6b2957580c652f5e2687dbfa0c9ebf8637e706a Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Fri, 14 Jan 2022 22:36:44 +0100 Subject: [PATCH] Naming; cleanup; logging for pcsc::initialize_card() --- card-functionality/src/tests.rs | 4 ---- pcsc/src/lib.rs | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/card-functionality/src/tests.rs b/card-functionality/src/tests.rs index e164464..7df97ed 100644 --- a/card-functionality/src/tests.rs +++ b/card-functionality/src/tests.rs @@ -707,11 +707,7 @@ pub fn run_test( let mut tx: Transaction = openpgp_card_pcsc::start_tx!(card_client.card()) .map_err(|e| anyhow!(e))?; - let mut txc = PcscTxClient::new(&mut tx); - let ard = CardApp::application_related_data(&mut txc)?; - let _app_id = ard.application_id()?; - t(&mut txc, param) } diff --git a/pcsc/src/lib.rs b/pcsc/src/lib.rs index 066e4d0..ddd7b5c 100644 --- a/pcsc/src/lib.rs +++ b/pcsc/src/lib.rs @@ -314,7 +314,7 @@ impl PcscClient { if store_card { let pcsc = PcscClient::new(card); - cas.push(pcsc.into_card_app()?); + cas.push(pcsc.initialize_card()?); } } @@ -360,7 +360,9 @@ impl PcscClient { /// Make an initialized CardApp from a PcscClient. /// Obtain and store feature lists from reader (pinpad functionality). - fn into_card_app(mut self) -> Result { + fn initialize_card(mut self) -> Result { + log::debug!("pcsc initialize_card"); + // Get Features from reader (pinpad verify/modify) if let Ok(feat) = self.features() { for tlv in feat {